From: Simon McVittie <smcv@debian.org>
Date: Sat, 12 Jul 2025 20:53:40 +0000 (+0100)
Subject: d/control, d/gbp.conf, d/watch: Use debian/trixie and upstream/48.x branches
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~119^2~14
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ed6765d3645b8e33a3317a7017c3d71737c73292;p=gnome-shell.git

d/control, d/gbp.conf, d/watch: Use debian/trixie and upstream/48.x branches
---

diff --git a/debian/control b/debian/control
index f125225c0..a7de58419 100644
--- a/debian/control
+++ b/debian/control
@@ -69,7 +69,7 @@ Build-Depends: appstream,
 Rules-Requires-Root: no
 Standards-Version: 4.7.2
 Homepage: https://wiki.gnome.org/Projects/GnomeShell
-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell.git
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell.git -b debian/trixie
 Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell
 
 Package: gnome-shell
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 7ad7f9fc6..c4c29fb79 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = debian/latest
-upstream-branch = upstream/latest
+debian-branch = debian/trixie
+upstream-branch = upstream/48.x
 
 [buildpackage]
 sign-tags = True
diff --git a/debian/watch b/debian/watch
index e66e0f1ff..5dab53737 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=4
 opts="searchmode=plain, uversionmangle=s/\.(alpha|beta|rc)/~$1/, downloadurlmangle=s|cache.json||" \
 https://download.gnome.org/sources/@PACKAGE@/cache.json \
-	[\d.]+/@PACKAGE@-([\d.]+\.?(?:beta|rc)?[\d.]*)@ARCHIVE_EXT@
+	48/@PACKAGE@-([\d.]+\.?(?:beta|rc)?[\d.]*)@ARCHIVE_EXT@